re-organized files for final project