Added more consistency to the code

- [x] Fixed namespaced files imports
- [x] Improved comments