new folder structure, bug fixes