Modified directory layout; added gitignore