Change directory structure and framework layout