Refactoring and moving of the layout classes to org.whizu.layout