Rearranging to remove extra main folder.
New layout.