Changed the directory structure to be more include friendly and more resilient to naming conflicts
Added .gitignore