Readd accidentially removed files
Move to Tomahawk namespace