Improve project structure and naming clarity

- Interface and class names changed to improve code clarity
- Folder structure re-organised for same reason