Restructure into modules rev 1