Try to modularize app