Various Fixes, change in project structure

Various Fixes, change in project structure