put app into multiple files
remove moment