Cleaned up root folder, added gitignore, fixed Environment based issue