Minor code refactoring
Change in directory structure
Modify .gitignore to exclue build directories