Cleaned up some files
Added rendering namespace, still need to add testing