Changed directory structure per new requirements