Moving fills to a separate class