Corrected directory structure (issue 1)