Changed directory structure a bit