moved modules from root into app dir