Fixed build, changed directory structure.
Modified the .gitignore