Restructuring the project as subdirs project