denamespaced, changed function signatures added stats
renamed files to reflect the new namespace