Changed containers structure and updated imports