Refactor/rename packages

1. Fix domain
2. Fix compilation warnings.