In the process of restructuring the code as different packages and tools