Removed additional .gitkeep files, no point in keeping them anymore
A multitude of changes and refactored code, comments added all around