Organized files

modified file hierarchy