changed file structure. cleaned up file structure