diff --git a/modules/cas_cache/cas_cache.h b/modules/cas_cache/cas_cache.h
index 000407d..6d295a1 100644
--- a/modules/cas_cache/cas_cache.h
+++ b/modules/cas_cache/cas_cache.h
@@ -19,7 +19,8 @@
 #include "classifier.h"
 #include "context.h"
 #include <linux/kallsyms.h>
-#include "cas_disk.h"
+#include "disk.h"
+#include "exp_obj.h"
 
 #define CAS_KERN_EMERG KERN_EMERG OCF_PREFIX_SHORT
 #define CAS_KERN_ALERT KERN_ALERT OCF_PREFIX_SHORT
diff --git a/modules/cas_cache/cas_disk.h b/modules/cas_cache/cas_disk.h
deleted file mode 100644
index ef734a1..0000000
--- a/modules/cas_cache/cas_disk.h
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Copyright(c) 2012-2022 Intel Corporation
- * SPDX-License-Identifier: BSD-3-Clause
- */
-#ifndef __CASDISK_H__
-#define __CASDISK_H__
-
-#include <linux/blkdev.h>
-#include "linux_kernel_version.h"
-#include "disk.h"
-#include "exp_obj.h"
-
-struct casdsk_disk;
-
-struct casdsk_exp_obj_ops {
-	/**
-	 * @brief Set geometry of exported object (top) block device.
-	 *	Could be NULL.
-	 */
-	int (*set_geometry)(struct casdsk_disk *dsk, void *private);
-
-	/**
-	 * @brief submit_bio of exported object (top) block device.
-	 * Called by cas_disk when cas_disk device is in attached mode.
-	 *
-	 */
-	void (*submit_bio)(struct casdsk_disk *dsk,
-			       struct bio *bio, void *private);
-};
-
-/**
- * @brief Open block device
- * @param path Path to block device
- * @param private Private data
- * @return Pointer to casdsk_disk related to opened block device
- */
-struct casdsk_disk *casdsk_disk_open(const char *path, void *private);
-
-/**
- * @brief Claim previously opened block device (holded by cas_disk)
- * @param path Path to block device
- * @param private Private data
- * @return Pointer to casdsk_disk structure related to block device, or NULL
- *	if device is not opened by cas_disk.
- */
-struct casdsk_disk *casdsk_disk_claim(const char *path, void *private);
-
-/**
- * @brief Close block device and remove from cas_disk
- * @param dsk Pointer to casdsk_disk structure related to block device
- *	which should be closed.
- */
-void casdsk_disk_close(struct casdsk_disk *dsk);
-
-/**
- * @brief Get block_device structure of bottom block device
- * @param dsk Pointer to casdsk_disk structure related to cas_disk device
- * @return Pointer to block_device structure of bottom block device
- */
-struct block_device *casdsk_disk_get_blkdev(struct casdsk_disk *dsk);
-
-/**
- * @brief Get request queue of bottom block device
- * @param dsk Pointer to casdsk_disk structure related to cas_disk device
- * @return Pointer to reqest_queue structure of bottom block device
- */
-struct request_queue *casdsk_disk_get_queue(struct casdsk_disk *dsk);
-
-/**
- * @brief Get gendisk structure of bottom block device
- * @param dsk Pointer to casdsk_disk structure related to cas_disk device
- * @return Pointer to gendisk structure of bottom block device
- */
-struct gendisk *casdsk_disk_get_gendisk(struct casdsk_disk *dsk);
-
-/**
- * @brief Create exported object (top device)
- * @param dsk Pointer to casdsk_disk structure related to cas_disk device
- * @param dev_name Name of exported object (top device)
- * @param owner Pointer to cas module
- * @param ops Pointer to structure with callback functions
- * @return 0 if success, errno if failure
- */
-int casdsk_exp_obj_create(struct casdsk_disk *dsk, const char *dev_name,
-			struct module *owner, struct casdsk_exp_obj_ops *ops);
-
-/**
- * @brief Get request queue of exported object (top) block device
- * @param dsk Pointer to casdsk_disk structure related to cas_disk device
- * @return Pointer to reqest_queue structure of top block device
- */
-struct request_queue *casdsk_exp_obj_get_queue(struct casdsk_disk *dsk);
-
-/**
- * @brief Get gendisk structure of exported object (top) block device
- * @param dsk Pointer to casdsk_disk structure related to cas_disk device
- * @return Pointer to gendisk structure of top block device
- */
-struct gendisk *casdsk_exp_obj_get_gendisk(struct casdsk_disk *dsk);
-
-/**
- * @brief Activate exported object (make it visible to OS
- *	and allow I/O handling)
- * @param dsk Pointer to casdsk_disk structure related to cas_disk device
- * @return 0 if success, errno if failure
- */
-int casdsk_exp_obj_activate(struct casdsk_disk *dsk);
-
-/**
- * @brief Lock exported object
- * @param dsk Pointer to casdsk_disk structure related to cas_disk device
- * @return 0 if success, errno if failure
- */
-int casdsk_exp_obj_lock(struct casdsk_disk *dsk);
-
-/**
- * @brief Unlock exported object
- * @param dsk Pointer to casdsk_disk structure related to cas_disk device
- * @return 0 if success, errno if failure
- */
-int casdsk_exp_obj_unlock(struct casdsk_disk *dsk);
-
-/**
- * @brief Destroy exported object
- * @param dsk Pointer to casdsk_disk structure related to cas_disk device
- * @return 0 if success, errno if failure
- */
-int casdsk_exp_obj_destroy(struct casdsk_disk *dsk);
-
-#endif
diff --git a/modules/cas_cache/disk.h b/modules/cas_cache/disk.h
index 27bdc78..b499bc8 100644
--- a/modules/cas_cache/disk.h
+++ b/modules/cas_cache/disk.h
@@ -41,5 +41,49 @@ void casdsk_deinit_disks(void);
 
 int casdsk_disk_allocate_minors(int count);
 
+/**
+ * @brief Open block device
+ * @param path Path to block device
+ * @param private Private data
+ * @return Pointer to casdsk_disk related to opened block device
+ */
+struct casdsk_disk *casdsk_disk_open(const char *path, void *private);
+
+/**
+ * @brief Claim previously opened block device (holded by cas_disk)
+ * @param path Path to block device
+ * @param private Private data
+ * @return Pointer to casdsk_disk structure related to block device, or NULL
+ *	if device is not opened by cas_disk.
+ */
+struct casdsk_disk *casdsk_disk_claim(const char *path, void *private);
+
+/**
+ * @brief Close block device and remove from cas_disk
+ * @param dsk Pointer to casdsk_disk structure related to block device
+ *	which should be closed.
+ */
+void casdsk_disk_close(struct casdsk_disk *dsk);
+
+/**
+ * @brief Get block_device structure of bottom block device
+ * @param dsk Pointer to casdsk_disk structure related to cas_disk device
+ * @return Pointer to block_device structure of bottom block device
+ */
+struct block_device *casdsk_disk_get_blkdev(struct casdsk_disk *dsk);
+
+/**
+ * @brief Get request queue of bottom block device
+ * @param dsk Pointer to casdsk_disk structure related to cas_disk device
+ * @return Pointer to reqest_queue structure of bottom block device
+ */
+struct request_queue *casdsk_disk_get_queue(struct casdsk_disk *dsk);
+
+/**
+ * @brief Get gendisk structure of bottom block device
+ * @param dsk Pointer to casdsk_disk structure related to cas_disk device
+ * @return Pointer to gendisk structure of bottom block device
+ */
+struct gendisk *casdsk_disk_get_gendisk(struct casdsk_disk *dsk);
 
 #endif
diff --git a/modules/cas_cache/exp_obj.c b/modules/cas_cache/exp_obj.c
index 29f045c..5deede1 100644
--- a/modules/cas_cache/exp_obj.c
+++ b/modules/cas_cache/exp_obj.c
@@ -10,7 +10,6 @@
 #include <linux/elevator.h>
 #include <linux/blk-mq.h>
 
-#include "cas_disk.h"
 #include "disk.h"
 #include "exp_obj.h"
 #include "linux_kernel_version.h"
diff --git a/modules/cas_cache/exp_obj.h b/modules/cas_cache/exp_obj.h
index 24c5bab..49319aa 100644
--- a/modules/cas_cache/exp_obj.h
+++ b/modules/cas_cache/exp_obj.h
@@ -10,9 +10,20 @@
 
 struct casdsk_disk;
 
-struct casdsk_exp_obj_pt_io_ctx {
-	struct casdsk_disk *dsk;
-	struct bio *bio;
+struct casdsk_exp_obj_ops {
+	/**
+	 * @brief Set geometry of exported object (top) block device.
+	 *	Could be NULL.
+	 */
+	int (*set_geometry)(struct casdsk_disk *dsk, void *private);
+
+	/**
+	 * @brief submit_bio of exported object (top) block device.
+	 * Called by cas_disk when cas_disk device is in attached mode.
+	 *
+	 */
+	void (*submit_bio)(struct casdsk_disk *dsk,
+			       struct bio *bio, void *private);
 };
 
 struct casdsk_exp_obj {
@@ -40,4 +51,58 @@ void casdsk_deinit_exp_objs(void);
 
 void casdsk_exp_obj_free(struct casdsk_disk *dsk);
 
+/**
+ * @brief Create exported object (top device)
+ * @param dsk Pointer to casdsk_disk structure related to cas_disk device
+ * @param dev_name Name of exported object (top device)
+ * @param owner Pointer to cas module
+ * @param ops Pointer to structure with callback functions
+ * @return 0 if success, errno if failure
+ */
+int casdsk_exp_obj_create(struct casdsk_disk *dsk, const char *dev_name,
+			struct module *owner, struct casdsk_exp_obj_ops *ops);
+
+/**
+ * @brief Get request queue of exported object (top) block device
+ * @param dsk Pointer to casdsk_disk structure related to cas_disk device
+ * @return Pointer to reqest_queue structure of top block device
+ */
+struct request_queue *casdsk_exp_obj_get_queue(struct casdsk_disk *dsk);
+
+/**
+ * @brief Get gendisk structure of exported object (top) block device
+ * @param dsk Pointer to casdsk_disk structure related to cas_disk device
+ * @return Pointer to gendisk structure of top block device
+ */
+struct gendisk *casdsk_exp_obj_get_gendisk(struct casdsk_disk *dsk);
+
+/**
+ * @brief Activate exported object (make it visible to OS
+ *	and allow I/O handling)
+ * @param dsk Pointer to casdsk_disk structure related to cas_disk device
+ * @return 0 if success, errno if failure
+ */
+int casdsk_exp_obj_activate(struct casdsk_disk *dsk);
+
+/**
+ * @brief Lock exported object
+ * @param dsk Pointer to casdsk_disk structure related to cas_disk device
+ * @return 0 if success, errno if failure
+ */
+int casdsk_exp_obj_lock(struct casdsk_disk *dsk);
+
+/**
+ * @brief Unlock exported object
+ * @param dsk Pointer to casdsk_disk structure related to cas_disk device
+ * @return 0 if success, errno if failure
+ */
+int casdsk_exp_obj_unlock(struct casdsk_disk *dsk);
+
+/**
+ * @brief Destroy exported object
+ * @param dsk Pointer to casdsk_disk structure related to cas_disk device
+ * @return 0 if success, errno if failure
+ */
+int casdsk_exp_obj_destroy(struct casdsk_disk *dsk);
+
 #endif