Changed directory structure to package style.