Refactored structure and modules to show a bit of consistency