Changed the directory structure, hope now things are clearer.