adjust code base structure for better executing