Moved project to clearer structure