Cleanup project structure and more README