WIP - Properly namesapce and add required files