changed file structure...

changed file structure...