Readjusted the file structure and fixed app naming.