Removed extra copies of files, reorganized application structure