Cleanup project structure
Various changes