Revert "some changes to project skeleton"

This reverts commit cf50f47f257c5c57a4f6ad235812797dcd5d4971.