Cleaned up and started restructuring for a modularised setup