change the project layout, change preprocess because of new files
Merge pull request #10 from nelly-hateva/changes

change the project layout, change preprocess because of new files