improved folder structure, added settings view, various small cleanups