Re-organised files onto modules