cleaned up file structure, changed how layout works.