[DEV][ENV] Structure changes
[ENV] Refactoring
[ENV] Refactoring