Updated the structure to help with ledgibility on modularising