Reorganized project, more changes to come