reorganize environment for easier building