Moved layout files into seperate folder