Changed directory structure
needs testing