Started to organize classes and layouts