Fixed makefile, gitignore
Reorganization
Various fixes