Updated directory structure

- Removed tests