Cleaned common folder

optimized the organization of the files