Restructure files. Fix loginLayout problem.