reorganize to support ubuntu