changed file structure

Effort to clean up file folder structure