Some restructuring and build commands.