Minor fixes + changed folderstructure.