fixing buildfiles and moving header to namespaced dir