reorganized file structure, pre test build 1