renamed folder structure to make app more reusable