fixing container issues
Organizing dev environment