Changed folder structure to look a bit nicer
made comments look nicer