Split app in files
Temporary fix bug on helper