Re-organize files and add two easier environments