Updated to v1.1

- Updated file/directory structure