moved layout to application directory
moved stuff to the includes directory