Moved app files into app dir, modularized server