Made a few structure changes to enhance things 

git-svn-id: https://plugins.svn.wordpress.org/simple-links/branches/2.0@776462 b8457f37-d9ea-0310-8a92-e5e31aec5664