diff --git a/README.textile b/README.textile
index 79d4b95..05f75eb 100644
--- a/README.textile
+++ b/README.textile
@@ -1,2 +1,2 @@
-LAMP Puppet Manifests for CentOS 5/Ubuntu
+LAMP Puppet Manifests for Ubuntu/Debian
 
diff --git a/manifests/classes/apache.pp b/manifests/classes/apache.pp
index 74a9121..367c063 100644
--- a/manifests/classes/apache.pp
+++ b/manifests/classes/apache.pp
@@ -1,23 +1,20 @@
 class apache {
 
-  package { httpd: ensure => installed }
-  package { httpd-devel: ensure => installed }
-  package { mod_ssl: ensure => installed }
-
+  package { 'apache2' : ensure => installed }
 
   service {
-    httpd:
+    'apache2' :
     enable    => true,
     ensure    => running,
-    subscribe => [Package[httpd], File["/etc/httpd/conf/httpd.conf"], Package[php], File["/etc/php.ini"]]
+    subscribe => [Package['apache2']]
   }
 
-  file { "/etc/httpd/conf/httpd.conf":
-      owner   => root,
-      group   => root,
-      mode    => 660,
-      source  => "/etc/puppet/files/etc/httpd/conf/httpd.conf",
-      require => [ Package[httpd] ]
-  }
+  #file { "/etc/httpd/conf/httpd.conf":
+  #    owner   => root,
+  #    group   => root,
+  #    mode    => 660,
+  #    source  => "/etc/puppet/files/etc/httpd/conf/httpd.conf",
+  #    require => [ Package[httpd] ]
+  #}
 
-}
\ No newline at end of file
+}
diff --git a/manifests/classes/build.pp b/manifests/classes/build.pp
deleted file mode 100644
index 4fbe4d6..0000000
--- a/manifests/classes/build.pp
+++ /dev/null
@@ -1,4 +0,0 @@
-class build {
-  package { gcc: ensure => installed }
-  package { make: ensure => installed }
-}
diff --git a/manifests/classes/git.pp b/manifests/classes/git.pp
deleted file mode 100644
index 299fcfa..0000000
--- a/manifests/classes/git.pp
+++ /dev/null
@@ -1,44 +0,0 @@
-class git {
-
-  package { zlib-devel: ensure => installed }
-  package { openssl-devel: ensure => installed }
-  package { curl-devel: ensure => installed }
-  package { expat-devel: ensure => installed }
-  package { gettext-devel: ensure => installed }
-  package { wget: ensure => installed }
-
-  $version = '1.6.0.4'
-
-  file { "/usr/local/src": ensure => directory }
-
-  exec { "download-git-tgz":
-      cwd       => "/usr/local/src",
-      path      => "/bin:/usr/bin",
-      command   => "wget http://kernel.org/pub/software/scm/git/git-$version.tar.gz",
-      creates   => "/usr/local/src/git-$version.tar.gz",
-      unless    => "git --version | grep '$version'",
-      before    => Exec["untar-git-source"],
-      require   => [Package[wget]]
-  }
-
-  exec { "untar-git-source":
-      command   => "tar xzf git-$version.tar.gz",
-      path      => "/bin:/usr/bin",
-      cwd       => "/usr/local/src",
-      creates   => "/usr/local/src/git-$version",
-      unless    => "git --version | grep '$version'",
-      subscribe => Exec["download-git-tgz"],
-      before    => Exec["make-install-git"]
-  }
-
-  exec { "make-install-git":
-      cwd       => "/usr/local/src/git-$version",
-      path      => "/bin:/usr/bin",
-      command   => "make clean && make prefix=/usr all && make prefix=/usr install",
-      creates   => [ "/usr/bin/git" ],
-      unless    => "git --version | grep '$version'",
-      subscribe => Exec["untar-git-source"],
-      require   => [Exec["untar-git-source"],Package[gcc],Package[make],Package[gettext-devel],Package[expat-devel],Package[curl-devel],Package[openssl-devel],Package[zlib-devel]]
-  }
-
-}
diff --git a/manifests/classes/lamp.pp b/manifests/classes/lamp.pp
index acb7e9b..8e22877 100644
--- a/manifests/classes/lamp.pp
+++ b/manifests/classes/lamp.pp
@@ -1,10 +1,6 @@
 class lamp {
-  include build,
-          ssh,
-          svn,
-          git,
+  include 
           apache,
-          mysql,
           php,
-          sudo
-}
\ No newline at end of file
+          mysql,
+}
diff --git a/manifests/classes/mysql.pp b/manifests/classes/mysql.pp
index 51368c5..421175c 100644
--- a/manifests/classes/mysql.pp
+++ b/manifests/classes/mysql.pp
@@ -1,21 +1,16 @@
 class mysql {
-
-  package { mysql: ensure => installed }
-  package { mysql-server: ensure => installed }
-
-  service {
-    mysqld:
-    enable    => true,
-    ensure    => running,
-    subscribe => Package[mysql-server]
+  package { 	
+		mysql-server: 			ensure => installed ,
+  		libapache2-mod-auth-mysql: 	ensure => installed,
+		php5-mysql:			ensure=>installed,
+		phpmyadmin:			ensure=>installed,
   }
 
-  file { "/etc/my.cnf":
-      owner   => root,
-      group   => root,
-      mode    => 660,
-      source  => "/etc/puppet/files/etc/my.cnf",
-      require => [ Package[mysql-server] ]
-  }
+  #service {
+  #  mysqld:
+  #  enable    => true,
+  #  ensure    => running,
+  #  subscribe => Package[mysql-server]
+  #}
 
-}
\ No newline at end of file
+}
diff --git a/manifests/classes/php.pp b/manifests/classes/php.pp
index 3b9e82f..81770ac 100644
--- a/manifests/classes/php.pp
+++ b/manifests/classes/php.pp
@@ -1,14 +1,8 @@
 class php {
 
-  package { php: ensure => installed }
-  package { php-mysql: ensure => installed }
-
-  file { "/etc/php.ini":
-      owner   => root,
-      group   => root,
-      mode    => 660,
-      source  => "/etc/puppet/files/etc/php.ini",
-      require => [ Package[php] ]
+  package { 
+		php5 : ensure => installed,
+		libapache2-mod-php5 : ensure => installed,
   }
 
-}
\ No newline at end of file
+}
diff --git a/manifests/classes/ssh.pp b/manifests/classes/ssh.pp
deleted file mode 100644
index d9cb6ce..0000000
--- a/manifests/classes/ssh.pp
+++ /dev/null
@@ -1,20 +0,0 @@
-class ssh {
-
-  package { openssh-server: ensure => installed }
-
-  service {
-    sshd:
-    enable    => true,
-    ensure    => running,
-    subscribe => [Package[openssh-server], File["/etc/ssh/sshd_config"]]
-  }
-
-  file { "/etc/ssh/sshd_config":
-      owner   => root,
-      group   => root,
-      mode    => 660,
-      source  => "/etc/puppet/files/etc/ssh/sshd_config",
-      require => [ Package[openssh-server] ]
-  }
-
-}
\ No newline at end of file
diff --git a/manifests/classes/sudo.pp b/manifests/classes/sudo.pp
deleted file mode 100644
index 9f0bde1..0000000
--- a/manifests/classes/sudo.pp
+++ /dev/null
@@ -1,11 +0,0 @@
-class sudo {
-  package { sudo: ensure => installed }
-
-  file { "/etc/sudoers":
-      owner   => root,
-      group   => root,
-      mode    => 440,
-      source  => "/etc/puppet/files/etc/sudoers",
-      require => [ Package["sudo"] ]
-  }
-}
\ No newline at end of file
diff --git a/manifests/classes/svn.pp b/manifests/classes/svn.pp
deleted file mode 100644
index 96003ef..0000000
--- a/manifests/classes/svn.pp
+++ /dev/null
@@ -1,3 +0,0 @@
-class svn {
-  package { subversion: ensure => installed }
-}
\ No newline at end of file