Re-structure project, update documentation