Restructurizing for deploy