Merged apps and cleaned up files