Folder reshuffle
More project layout changes. Now have a base library