Cleanup (moving files into own folders, removing old classes) and re-adding Options menu