Cleanup project structure - more small fixes