reorganize pkg namespace and paths to camel case