removed 'app' folder for preventing confusion, new dir structure