Removed test classes and moved Layout classes to separate files