Rejigged layout. Removed most files