rearranged app to follow module pattern