Fixed project skeleton

see commit messages