Changed file structure

Put in one folder