restructured dev enviroment