Splitting into 'lib' and 'app'