Changed directory structure entirely to better suit components.