Start using separate files