Restructuring the project - delete old source