Added concept of project, moved upload into folders, other tweaks