* Quick restructure before lab, added Test folder.