diff --git a/aws_console/__init__.py b/aws_console/__init__.py
deleted file mode 100644
index 7fd229a..0000000
--- a/aws_console/__init__.py
+++ /dev/null
@@ -1 +0,0 @@
-__version__ = '0.2.0'
diff --git a/setup.py b/setup.py
index c77989c..b6e4904 100755
--- a/setup.py
+++ b/setup.py
@@ -21,13 +21,21 @@ def find_version(*file_paths):
 
 setup(
     name='aws_console',
-    version=find_version("aws_console", "__init__.py"),
+    version=find_version('src', 'aws_console', '__init__.py'),
     description='AWS Console Login Utility',
+    keywords = [
+        'aws',
+        'aws-sdk',
+        'aws-cli',
+        'aws-authentication',
+        'aws-sdk-python',
+        'aws-auth'
+    ],
     long_description=read("README.md"),
     packages=find_packages(),
     entry_points={
         'console_scripts': [
-            'aws-console = aws_console.main:main'
+            'aws-console = aws_console.aws_console:main'
         ]
     },
     install_requires=[
@@ -35,6 +43,7 @@ def find_version(*file_paths):
         'pyperclip>=1.8,<1.9'
     ],
     author='Snigdhajyoti Ghosh',
+    author_email='snigdhajyotighos.h@gmail.com',
     url='https://github.com/snigdhasjg/aws-console',
     license="MIT License",
     classifiers=[
@@ -42,8 +51,8 @@ def find_version(*file_paths):
         'License :: OSI Approved :: MIT License',
         'Intended Audience :: Developers',
         'Intended Audience :: System Administrators',
-        'Operating System :: MacOS',
-        'Operating System :: POSIX :: Linux',
-        'Development Status :: 4 - Beta'
+        'Operating System :: OS Independent',
+        'Development Status :: 5 - Production/Stable',
+        'Topic :: Utilities'
     ],
 )
diff --git a/src/aws_console/__init__.py b/src/aws_console/__init__.py
new file mode 100644
index 0000000..cce384d
--- /dev/null
+++ b/src/aws_console/__init__.py
@@ -0,0 +1 @@
+__version__ = '0.3'
diff --git a/aws_console/main.py b/src/aws_console/aws_console.py
similarity index 100%
rename from aws_console/main.py
rename to src/aws_console/aws_console.py
diff --git a/aws_console/aws_console_login.py b/src/aws_console/aws_console_login.py
similarity index 100%
rename from aws_console/aws_console_login.py
rename to src/aws_console/aws_console_login.py
diff --git a/aws_console/credentials.py b/src/aws_console/credentials.py
similarity index 100%
rename from aws_console/credentials.py
rename to src/aws_console/credentials.py
diff --git a/aws_console/input_output/__init__.py b/src/aws_console/input_output/__init__.py
similarity index 100%
rename from aws_console/input_output/__init__.py
rename to src/aws_console/input_output/__init__.py
diff --git a/aws_console/input_output/browser.py b/src/aws_console/input_output/browser.py
similarity index 100%
rename from aws_console/input_output/browser.py
rename to src/aws_console/input_output/browser.py
diff --git a/aws_console/input_output/cli.py b/src/aws_console/input_output/cli.py
similarity index 100%
rename from aws_console/input_output/cli.py
rename to src/aws_console/input_output/cli.py