Project celan-up

Project reorganization
.gitignore update