Reconfigured directory structure, added gitingore file, and updated some code