Package rename, project structure update