added prototype for release 1, reorganised folders