Initial Project Setup

Initial cleanup/setup after fork from original project