Slight restructure of Factories