User created, refactor files into app directory