Started a proper cabalised etc. library structure