Modified file structure and started work on base classes