deleted libs, tidied up data layer, updated main, user, and fb modules