Directory structure

Change directory structure for the package