Restructure app files