Getting rid of first_app folder