~ fixes in project structure