Cleaned up project, moved directory structure.