Clarifies phases, adds directory structure