Removed start of Facebook logic
reorg of class packages