Rearranged directory structure on app and tests