organized files and modified references to files in code