Renames folders and reorganizes variables; fixes #9