some directory structure changes and simplified file structure