Merge "Refactor package structure for scalability and resolve lint problems." into tm-dev