Moved some files
Modified directory structure and .gitignore