[Refacto] updated wpcc source organisation