diff --git a/lib/supportbee.rb b/lib/supportbee.rb
index 5046d11..b4290a9 100644
--- a/lib/supportbee.rb
+++ b/lib/supportbee.rb
@@ -2,16 +2,10 @@
 require "supportbee/tickets"
 require 'httparty'
 require 'json'
-require 'supportbee/ticket'
-require 'supportbee/agent'
-require 'supportbee/label'
 
 module Supportbee
   class Base
     include HTTParty
-    include Supportbee::Ticket
-    include Supportbee::Agent
-    include Supportbee::Label
 
     # 
     # TODO : this initialize to be shifted to api.rb
@@ -28,14 +22,5 @@ def self.call(cmd, options)
       self.new.send(cmd, options)
     end
     
-    #It's takes ticket,agent,label get as parameter and call appropriate module
-    #TODO need to finalize parameters
-    def self.run cmd
-      supportbee = Supportbee::Base.new("josh", "4rP9QFdmxNUyyK-saK7H")
-      
-      if cmd == "tickets"
-        supportbee.tickets
-      end
-    end
   end
 end
diff --git a/lib/supportbee/agent.rb b/lib/supportbee/agent.rb
deleted file mode 100644
index b2748d2..0000000
--- a/lib/supportbee/agent.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module Supportbee
-  module Agent
-
-  end
-end
diff --git a/lib/supportbee/label.rb b/lib/supportbee/label.rb
deleted file mode 100644
index 8c47d09..0000000
--- a/lib/supportbee/label.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-module Supportbee
-  module Label
-
-  end
-end
diff --git a/lib/supportbee/ticket.rb b/lib/supportbee/ticket.rb
deleted file mode 100644
index 54c2af8..0000000
--- a/lib/supportbee/ticket.rb
+++ /dev/null
@@ -1,18 +0,0 @@
- module Supportbee
-   module Ticket
-     def tickets(options={})
-       valid_keys = [:per_page, :page, :spam, :trash, :replies, :max_replies, :assigned_user, :assigned_group, :starred, :label, :since, :until]
-       invalid_keys = options.keys - valid_keys
-
-       raise "Invalid Options: #{invalid_keys.join(', ')}" unless invalid_keys.empty?
-
-       self.class.default_params.merge!(options)
-
-       response = self.class.get("/tickets.json")
-       result = JSON.parse(response.body)
-       result['tickets'].map do |ticket|
-         {ticket['id'] => ticket['subject']}
-       end
-     end
-   end
- end
diff --git a/lib/supportbee/tickets.rb b/lib/supportbee/tickets.rb
index 511acb5..95644dd 100644
--- a/lib/supportbee/tickets.rb
+++ b/lib/supportbee/tickets.rb
@@ -8,6 +8,21 @@ class << self
       def method_missing(method, argv)
         puts 'Not Implemented yet.'
       end
+
+      def tickets(options={})
+        valid_keys = [:group, :per_page, :page, :spam, :trash, :replies, :max_replies, :assigned_user, :assigned_group, :starred, :label, :since, :until]
+        invalid_keys = options.keys - valid_keys
+
+        raise "Invalid Options: #{invalid_keys.join(', ')}" unless invalid_keys.empty?
+
+        self.class.default_params.merge!(options)
+
+        response = self.class.get("/tickets.json")
+        result = JSON.parse(response.body)
+        result['tickets'].map do |ticket|
+          {ticket['id'] => ticket['subject']}
+        end
+      end
     end
 
   end
diff --git a/supportbee.rb b/supportbee.rb
deleted file mode 100644
index 245ce88..0000000
--- a/supportbee.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /usr/bin/env ruby
-
-lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
-$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
-
-require 'supportbee'
-
-Supportbee::Base.run 'tickets' 
-