add re-organization of files to breakdown order for more clean code