Changed directory structure (Final final draft)