Code cleanup (mostly includes)
namespace fix