removing unneccessary files and renaming the main template

diff --git a/aws/EC2InstanceWithSecurityGroupSample-1.0.0.template b/aws/EC2InstanceWithSecurityGroupSample-1.0.0.template
deleted file mode 100755
index 57b1613..0000000
--- a/aws/EC2InstanceWithSecurityGroupSample-1.0.0.template
+++ /dev/null
@@ -1,101 +0,0 @@
-{
-  "AWSTemplateFormatVersion" : "2010-09-09",
-
-  "Description" : "This template creates a basic t1.micro ec2 instance using 64bit aws linux ami",
-
-  "Parameters" : {
-    "KeyName" : {
-      "Description" : "Name of and existing EC2 KeyPair to enable SSH access to the instance",
-      "Type" : "String"
-    }
-  },
-
-  "Mappings" : {
-    "RegionMap" : {
-      "us-east-1" : {
-          "AMI" : "ami-aecd60c7"
-      },
-      "us-west-1" : {
-          "AMI" : "ami-655a0a20"
-      },
-      "eu-west-1" : {
-          "AMI" : "ami-7fd4e10b"
-      },
-      "ap-southeast-1" : {
-          "AMI" : "ami-72621c20"
-      },
-      "ap-northeast-1" : {
-          "AMI" : "ami-8e08a38f"
-      }
-    }
-  },
-
-  "Resources" : {
-    "Ec2Instance" : {
-      "Type" : "AWS::EC2::Instance",
-	  "Properties" : {
-		"InstanceType" : "t1.micro",
-		"SecurityGroups" : [ { "Ref" : "CFormSecGroup" } ],
-		"KeyName" : { "Ref" : "KeyName" },
-		"ImageId" : { "Fn::FindInMap" : [ "RegionMap", { "Ref" : "AWS::Region" }, "AMI" ]},
-		"UserData" : { "Fn::Base64" : { "Fn::Join" : ["",[
-      "#!/bin/bash -ex","\n",
-      "yum -y install gcc-c++ make puppet links squid bind-chroot openvpn rubygems","\n",
-      "wget https://github.com/mshirley/setec-astronomy/zipball/master -O /tmp/setec-astronomy.zip","\n",
-      "unzip /tmp/setec-astronomy.zip -d /tmp","\n",
-      "mv /tmp/mshirley-setec-* /tmp/setec-astronomy","\n",
-      "wget -P /tmp https://s3.amazonaws.com/setec-astronomy-s3/installers/ejabberd-2.1.11-linux-x86_64-installer.run.gz","\n",
-      "gzip -d /tmp/ejabberd-2.1.11-linux-x86_64-installer.run.gz","\n",
-      "chmod u+x /tmp/ejabberd-2.1.11-linux-x86_64-installer.run","\n",
-      "/tmp/ejabberd-2.1.11-linux-x86_64-installer.run --mode unattended --adminpw password","\n",
-      "echo -ne ' setec-astronomy' >> /etc/hosts","\n",
-      "openvpn --genkey --secret /etc/openvpn/static.key","\n",
-      "cp /etc/openvpn/static.key /home/ec2-user/","\n",
-      "chown ec2-user /home/ec2-user/static.key","\n",
-      "cp /tmp/setec-astronomy/conf/openvpn/server-pki.conf /etc/openvpn/","\n",
-      "gem install sinatra","\n",
-      "cd /tmp/setec-astronomy/conf/openvpn/easy-rsa-new/","\n",
-      "sh /tmp/setec-astronomy/conf/openvpn/easy-rsa-new/doit2.sh","\n",
-      "nohup ruby /tmp/setec-astronomy/controller/controller.rb -p 1234 >/dev/null &"
-      ]]}}
-      }
-    },
-
-    "CFormSecGroup" : {
-      "Type" : "AWS::EC2::SecurityGroup",
-      "Properties" : {
-        "GroupDescription" : "Enable SSH, Openvpn, and controller.rb",
-        "SecurityGroupIngress" : [ {
-          "IpProtocol" : "tcp",
-          "FromPort" : "22",
-          "ToPort" : "22",
-          "CidrIp" : "0.0.0.0/0" },
-      {
-		  "IpProtocol" : "udp",
-		  "FromPort" : "1194",
-		  "ToPort" : "1194",
-		  "CidrIp" : "0.0.0.0/0" },
-      {
-      "IpProtocol" : "tcp",
-      "FromPort" : "1234",
-      "ToPort" : "1234",
-      "CidrIp" : "0.0.0.0/0" } ]
-      }
-    }
-  },
-
-  "Outputs" : {
-    "InstanceId" : {
-      "Description" : "InstanceId of the newly created EC2 instance",
-      "Value" : { "Ref" : "Ec2Instance" }
-    },
-    "AZ" : {
-      "Description" : "Availability Zone of the newly created EC2 instance",
-      "Value" : { "Fn::GetAtt" : [ "Ec2Instance", "AvailabilityZone" ] }
-    },
-    "PublicIP" : {
-      "Description" : "Public IP address of the newly created EC2 instance",
-      "Value" : { "Fn::GetAtt" : [ "Ec2Instance", "PublicIp" ] }
-    }
-  }
-}
diff --git a/aws/cloudformation-simple.template b/aws/cloudformation-simple.template
deleted file mode 100644
index 6b4ced0..0000000
--- a/aws/cloudformation-simple.template
+++ /dev/null
@@ -1,85 +0,0 @@
-{
-  "AWSTemplateFormatVersion" : "2010-09-09",
-
-  "Description" : "AWS CloudFormation Sample Template SampleRailsApp: This sample template shows how to use AWS CloudFormation with the Amazon Linux AMI Cloud-init feature to instantiate an application at runtime. The sample uses the WaitCondition resource to synchronize creation of the stack with the application becoming healthy. **WARNING** This template creates an Amazon EC2 instance and an Elastic IP Address. You will be billed for the AWS resources used if you create a stack from this template.",
-
-  "Parameters" : {
-    "KeyName" : {
-      "Description" : "Name of an existing EC2 KeyPair to enable SSH access to the instance",
-      "Type" : "String"
-    }
-  },
-
-  "Mappings" : {
-    "RegionMap" : {
-      "us-east-1"      : { "AMI" : "ami-7f418316" },
-      "us-west-1"      : { "AMI" : "ami-951945d0" },
-      "us-west-2"      : { "AMI" : "ami-16fd7026" },
-      "eu-west-1"      : { "AMI" : "ami-24506250" },
-      "sa-east-1"      : { "AMI" : "ami-3e3be423" },
-      "ap-southeast-1" : { "AMI" : "ami-74dda626" },
-      "ap-northeast-1" : { "AMI" : "ami-dcfa4edd" }
-    }
-  },
-
-  "Resources" : {
-    "Ec2Instance" : {
-      "Type" : "AWS::EC2::Instance",
-      "Properties" : {
-        "KeyName" : { "Ref" : "KeyName" },
-        "SecurityGroups" : [ { "Ref" : "InstanceSecurityGroup" } ],
-        "ImageId" : { "Fn::FindInMap" : [ "RegionMap", { "Ref" : "AWS::Region" }, "AMI" ]},
-        "UserData" : { "Fn::Base64" : { "Fn::Join" : ["",[
-            "#!/bin/bash -ex","\n",
-            "yum -y install gcc-c++ make","\n",
-            "yum -y install mysql-devel sqlite-devel","\n",
-            "yum -y install ruby-rdoc rubygems ruby-mysql ruby-devel","\n",
-            "gem install --no-ri --no-rdoc rails","\n",
-            "gem install --no-ri --no-rdoc mysql","\n",
-            "gem install --no-ri --no-rdoc sqlite3","\n",
-            "rails new myapp","\n",
-            "cd myapp","\n",
-            "rails server -d","\n",
-            "curl -X PUT -H 'Content-Type:' --data-binary '{\"Status\" : \"SUCCESS\",",
-                                                           "\"Reason\" : \"The application myapp is ready\",",
-                                                           "\"UniqueId\" : \"myapp\",",
-                                                           "\"Data\" : \"Done\"}' ",
-                  "\"", {"Ref" : "WaitForInstanceWaitHandle"},"\"\n" ]]}}
-      }
-    },
-
-    "InstanceSecurityGroup" : {
-      "Type" : "AWS::EC2::SecurityGroup",
-      "Properties" : {
-        "GroupDescription" : "Enable Access to Rails application via port 3000 and SSH access via port 22",
-        "SecurityGroupIngress" : [
-          {"IpProtocol" : "tcp", "FromPort" : "22", "ToPort" : "22", "CidrIp" : "0.0.0.0/0" },
-          {"IpProtocol" : "tcp", "FromPort" : "3000", "ToPort" : "3000", "CidrIp" : "0.0.0.0/0" }
-        ]
-      }
-    },
-
-    "WaitForInstanceWaitHandle" : {
-      "Type" : "AWS::CloudFormation::WaitConditionHandle",
-      "Properties" : {
-      }
-    },
-
-    "WaitForInstance" : {
-      "Type" : "AWS::CloudFormation::WaitCondition",
-      "DependsOn" : "Ec2Instance",
-      "Properties" : {
-        "Handle" : {"Ref" : "WaitForInstanceWaitHandle"},
-        "Timeout" : "600"
-      }
-    }
-  },
-
-  "Outputs" : {
-    "WebsiteURL" : {
-      "Description" : "The URL for the newly created Rails application",
-      "Value" : { "Fn::Join" : ["", [ "http://", { "Fn::GetAtt" : [ "Ec2Instance", "PublicDnsName" ] }, ":3000" ]]}
-    }
-  }
-}
-
diff --git a/aws/cloudformation.template b/aws/cloudformation.template
deleted file mode 100644
index d508a09..0000000
--- a/aws/cloudformation.template
+++ /dev/null
@@ -1,278 +0,0 @@
-{
-  "AWSTemplateFormatVersion" : "2010-09-09",
-
-  "Description" : "AWS CloudFormation Sample Template Drupal_Single_Instance. Drupal is an open source content management platform powering millions of websites and applications. This template installs a singe instance deployment with a local MySQL database for storage. It uses the AWS CloudFormation bootstrap scripts to install packages and files at instance launch time. **WARNING** This template creates an Amazon EC2 instance. You will be billed for the AWS resources used if you create a stack from this template.",
-
-  "Parameters" : {
-
-    "KeyName" : {
-      "Description" : "Name of an existing EC2 KeyPair to enable SSH access to the instances",
-      "Type" : "String"
-    },
-
-    "InstanceType" : {
-      "Description" : "WebServer EC2 instance type",
-      "Type" : "String",
-      "Default" : "m1.small",
-      "AllowedValues" : [ "t1.micro","m1.small","m1.medium","m1.large","m1.xlarge","m2.xlarge","m2.2xlarge","m2.4xlarge","c1.medium","c1.xlarge","cc1.4xlarge","cc2.8xlarge","cg1.4xlarge"],
-      "ConstraintDescription" : "must be a valid EC2 instance type."
-    },
-
-    "SiteName": {
-      "Default": "My Site",
-      "Description" : "The name of the Drupal Site",
-      "Type": "String"
-    },
-
-    "SiteEMail": {
-      "Description" : "EMail for site adminitrator",
-      "Type": "String"
-    },
-
-    "SiteAdmin": {
-      "Description" : "The Drupal site admin account username",
-      "Type": "String",
-      "MinLength": "1",
-      "MaxLength": "16",
-      "AllowedPattern" : "[a-zA-Z][a-zA-Z0-9]*",
-      "ConstraintDescription" : "must begin with a letter and contain only alphanumeric characters."
-    },
-
-    "SitePassword": {
-      "NoEcho": "true",
-      "Description" : "The Drupal site admin account password",
-      "Type": "String",
-      "MinLength": "1",
-      "MaxLength": "41",
-      "AllowedPattern" : "[a-zA-Z0-9]*",
-      "ConstraintDescription" : "must contain only alphanumeric characters."
-    },
-
-    "DBName": {
-      "Default": "drupaldb",
-      "Description" : "The Drupal database name",
-      "Type": "String",
-      "MinLength": "1",
-      "MaxLength": "64",
-      "AllowedPattern" : "[a-zA-Z][a-zA-Z0-9]*",
-      "ConstraintDescription" : "must begin with a letter and contain only alphanumeric characters."
-    },
-
-    "DBUsername": {
-      "Default": "admin",
-      "NoEcho": "true",
-      "Description" : "The Drupal database admin account username",
-      "Type": "String",
-      "MinLength": "1",
-      "MaxLength": "16",
-      "AllowedPattern" : "[a-zA-Z][a-zA-Z0-9]*",
-      "ConstraintDescription" : "must begin with a letter and contain only alphanumeric characters."
-    },
-
-    "DBPassword": {
-      "Default": "admin",
-      "NoEcho": "true",
-      "Description" : "The Drupal database admin account password",
-      "Type": "String",
-      "MinLength": "1",
-      "MaxLength": "41",
-      "AllowedPattern" : "[a-zA-Z0-9]*",
-      "ConstraintDescription" : "must contain only alphanumeric characters."
-    },
-
-    "DBRootPassword": {
-      "NoEcho": "true",
-      "Description" : "Root password for MySQL",
-      "Type": "String",
-      "MinLength": "1",
-      "MaxLength": "41",
-      "AllowedPattern" : "[a-zA-Z0-9]*",
-      "ConstraintDescription" : "must contain only alphanumeric characters."
-    }
-  },
-
-  "Mappings" : {
-    "AWSInstanceType2Arch" : {
-      "t1.micro"    : { "Arch" : "64" },
-      "m1.small"    : { "Arch" : "64" },
-      "m1.medium"   : { "Arch" : "64" },
-      "m1.large"    : { "Arch" : "64" },
-      "m1.xlarge"   : { "Arch" : "64" },
-      "m2.xlarge"   : { "Arch" : "64" },
-      "m2.2xlarge"  : { "Arch" : "64" },
-      "m2.4xlarge"  : { "Arch" : "64" },
-      "c1.medium"   : { "Arch" : "64" },
-      "c1.xlarge"   : { "Arch" : "64" },
-      "cc1.4xlarge" : { "Arch" : "64HVM" },
-      "cc2.8xlarge" : { "Arch" : "64HVM" },
-      "cg1.4xlarge" : { "Arch" : "64HVM" }
-    },
-
-    "AWSRegionArch2AMI" : {
-      "us-east-1"      : { "32" : "ami-31814f58", "64" : "ami-1b814f72", "64HVM" : "ami-0da96764" },
-      "us-west-2"      : { "32" : "ami-38fe7308", "64" : "ami-30fe7300", "64HVM" : "NOT_YET_SUPPORTED" },
-      "us-west-1"      : { "32" : "ami-11d68a54", "64" : "ami-1bd68a5e", "64HVM" : "NOT_YET_SUPPORTED" },
-      "eu-west-1"      : { "32" : "ami-973b06e3", "64" : "ami-953b06e1", "64HVM" : "NOT_YET_SUPPORTED" },
-      "ap-southeast-1" : { "32" : "ami-b4b0cae6", "64" : "ami-beb0caec", "64HVM" : "NOT_YET_SUPPORTED" },
-      "ap-northeast-1" : { "32" : "ami-0644f007", "64" : "ami-0a44f00b", "64HVM" : "NOT_YET_SUPPORTED" },
-      "sa-east-1"      : { "32" : "ami-3e3be423", "64" : "ami-3c3be421", "64HVM" : "NOT_YET_SUPPORTED" }
-    }
-  },
-
-  "Resources" : {
-
-    "CfnUser" : {
-      "Type" : "AWS::IAM::User",
-      "Properties" : {
-        "Path": "/",
-        "Policies": [{
-          "PolicyName": "root",
-          "PolicyDocument": { "Statement":[{
-            "Effect":"Allow",
-            "Action":"cloudformation:DescribeStackResource",
-            "Resource":"*"
-          }]}
-        }]
-      }
-    },
-
-    "HostKeys" : {
-      "Type" : "AWS::IAM::AccessKey",
-      "Properties" : {
-        "UserName" : {"Ref": "CfnUser"}
-      }
-    },
-
-    "WebServer": {
-      "Type": "AWS::EC2::Instance",
-      "Metadata" : {
-        "AWS::CloudFormation::Init" : {
-          "config" : {
-            "packages" : {
-              "yum" : {
-                "httpd"        : [],
-                "php"          : [],
-                "php-mysql"    : [],
-                "php-gd"       : [],
-                "php-xml"      : [],
-                "php-mbstring" : [],
-                "mysql"        : [],
-                "mysql-server" : [],
-                "mysql-devel"  : [],
-                "mysql-libs"   : []
-
-              }
-            },
-
-            "sources" : {
-              "/var/www/html"  : "http://ftp.drupal.org/files/projects/drupal-7.8.tar.gz",
-              "/home/ec2-user" : "http://ftp.drupal.org/files/projects/drush-7.x-4.5.tar.gz"
-            },
-
-            "files" : {
-              "/tmp/setup.mysql" : {
-                "content" : { "Fn::Join" : ["", [
-                  "CREATE DATABASE ", { "Ref" : "DBName" }, ";\n",
-                  "CREATE USER '", { "Ref" : "DBUsername" }, "'@'localhost' IDENTIFIED BY '", { "Ref" : "DBPassword" }, "';\n",
-                  "GRANT ALL ON ", { "Ref" : "DBName" }, ".* TO '", { "Ref" : "DBUsername" }, "'@'localhost';\n",
-                  "FLUSH PRIVILEGES;\n"
-                  ]]},
-                "mode"  : "000644",
-                "owner" : "root",
-                "group" : "root"
-              }
-            },
-
-            "services" : {
-              "sysvinit" : {
-                "httpd"    : { "enabled" : "true", "ensureRunning" : "true" },
-                "mysqld"   : { "enabled" : "true", "ensureRunning" : "true" },
-                "sendmail" : { "enabled" : "false", "ensureRunning" : "false" }
-              }
-            }
-          }
-        }
-      },
-      "Properties": {
-        "ImageId" : { "Fn::FindInMap" : [ "AWSRegionArch2AMI", { "Ref" : "AWS::Region" },
-                          { "Fn::FindInMap" : [ "AWSInstanceType2Arch", { "Ref" : "InstanceType" }, "Arch" ] } ] },
-        "InstanceType"   : { "Ref" : "InstanceType" },
-        "SecurityGroups" : [ {"Ref" : "WebServerSecurityGroup"} ],
-        "KeyName"        : { "Ref" : "KeyName" },
-        "UserData"       : { "Fn::Base64" : { "Fn::Join" : ["", [
-          "#!/bin/bash -v\n",
-          "yum update -y aws-cfn-bootstrap\n",
-
-
-          "# Helper function\n",
-          "function error_exit\n",
-          "{\n",
-          "  /opt/aws/bin/cfn-signal -e 0 -r \"$1\" '", { "Ref" : "WaitHandle" }, "'\n",
-          "  exit 1\n",
-          "}\n",
-
-          "# Install Apache Web Server, MySQL, PHP and Drupal\n",
-          "/opt/aws/bin/cfn-init -s ", { "Ref" : "AWS::StackName" }, " -r WebServer ",
-          "    --access-key ",  { "Ref" : "HostKeys" },
-          "    --secret-key ", {"Fn::GetAtt": ["HostKeys", "SecretAccessKey"]},
-          "    --region ", { "Ref" : "AWS::Region" }, " || error_exit 'Failed to run cfn-init'\n",
-
-          "# Setup MySQL root password and create a user\n",
-          "mysqladmin -u root password '", { "Ref" : "DBRootPassword" }, "' || error_exit 'Failed to initialize root password'\n",
-          "mysql -u root --password='", { "Ref" : "DBRootPassword" }, "' < /tmp/setup.mysql || error_exit 'Failed to create database user'\n",
-
-          "# Make changes to Apache Web Server configuration\n",
-          "mv /var/www/html/drupal-7.8/* /var/www/html\n",
-          "mv /var/www/html/drupal-7.8/.* /var/www/html\n",
-          "rmdir /var/www/html/drupal-7.8\n",
-          "sed -i 's/AllowOverride None/AllowOverride All/g'  /etc/httpd/conf/httpd.conf\n",
-          "service httpd restart\n",
-
-          "# Create the site in Drupal\n",
-          "cd /var/www/html\n",
-          "~ec2-user/drush/drush site-install standard --yes",
-          "     --site-name='", { "Ref" : "SiteName" }, "' --site-mail=", { "Ref" : "SiteEMail" },
-          "     --account-name=", { "Ref" : "SiteAdmin" }, " --account-pass=", { "Ref" : "SitePassword" },
-          "     --db-url=mysql://", { "Ref" : "DBUsername" }, ":", { "Ref" : "DBPassword" }, "@localhost/", { "Ref" : "DBName" },
-          "     --db-prefix=drupal_\n",
-          "chown apache:apache sites/default/files\n",
-
-          "# All is well so signal success\n",
-          "/opt/aws/bin/cfn-signal -e 0 -r \"Drupal setup complete\" '", { "Ref" : "WaitHandle" }, "'\n"
-
-        ]]}}
-      }
-    },
-
-    "WaitHandle" : {
-      "Type" : "AWS::CloudFormation::WaitConditionHandle"
-    },
-
-    "WaitCondition" : {
-      "Type" : "AWS::CloudFormation::WaitCondition",
-      "DependsOn" : "WebServer",
-      "Properties" : {
-        "Handle" : {"Ref" : "WaitHandle"},
-        "Timeout" : "300"
-      }
-    },
-
-    "WebServerSecurityGroup" : {
-      "Type" : "AWS::EC2::SecurityGroup",
-      "Properties" : {
-        "GroupDescription" : "Enable HTTP access via port 80 and SSH access",
-        "SecurityGroupIngress" : [
-          {"IpProtocol" : "tcp", "FromPort" : "80", "ToPort" : "80", "CidrIp" : "0.0.0.0/0"},
-          {"IpProtocol" : "tcp", "FromPort" : "22", "ToPort" : "22", "CidrIp" : "0.0.0.0/0"}
-        ]
-      }
-    }
-  },
-
-  "Outputs" : {
-    "WebsiteURL" : {
-      "Value" : { "Fn::Join" : ["", ["http://", { "Fn::GetAtt" : [ "WebServer", "PublicDnsName" ]}]] },
-      "Description" : "Drupal Website"
-    }
-  }
-}