reorganized directory structure
more reorganization of files