Create more smaller modules