diff --git a/Vagrantfile b/Vagrantfile
index ad68939..1de08c2 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -13,9 +13,11 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   v.cpus = 2
 end
    
+  config.vm.provision :shell do |shell|
+    shell.inline = "puppet module install puppetlabs/apt"
+  end
   
   config.vm.provision :puppet do |puppet|
-    puppet.module_path = 'puppet/modules'
     puppet.manifests_path = 'puppet/manifests'
     puppet.manifest_file = 'site.pp'
   end
diff --git a/puppet/modules/baseconfig/manifests/init.pp b/puppet/manifests/baseconfig.pp
similarity index 52%
rename from puppet/modules/baseconfig/manifests/init.pp
rename to puppet/manifests/baseconfig.pp
index 2ecaa09..5ee6771 100644
--- a/puppet/modules/baseconfig/manifests/init.pp
+++ b/puppet/manifests/baseconfig.pp
@@ -9,11 +9,4 @@ class baseconfig {
     command => '/usr/bin/apt-get update';
   }
 
-  file {
-    '/home/vagrant/.bashrc':
-      owner => 'vagrant',
-      group => 'vagrant',
-      mode  => '0644',
-      source => 'puppet:///modules/baseconfig/bashrc';
-  }
 }
\ No newline at end of file
diff --git a/puppet/modules/devPackages/manifests/init.pp b/puppet/manifests/devPackages.pp
similarity index 100%
rename from puppet/modules/devPackages/manifests/init.pp
rename to puppet/manifests/devPackages.pp
diff --git a/puppet/modules/monodevelop/manifests/init.pp b/puppet/manifests/monoDevelop.pp
similarity index 100%
rename from puppet/modules/monodevelop/manifests/init.pp
rename to puppet/manifests/monoDevelop.pp
diff --git a/puppet/manifests/site.pp b/puppet/manifests/site.pp
index e43d914..38fdf81 100644
--- a/puppet/manifests/site.pp
+++ b/puppet/manifests/site.pp
@@ -1,3 +1,8 @@
+import 'baseconfig.pp'
+import 'devPackages.pp'
+import 'ubuntuDesktop.pp'
+import 'monoDevelop.pp'
+
 include baseconfig
 include devPackages
 include ubuntuDesktop
diff --git a/puppet/modules/ubuntuDesktop/manifests/init.pp b/puppet/manifests/ubuntuDesktop.pp
similarity index 100%
rename from puppet/modules/ubuntuDesktop/manifests/init.pp
rename to puppet/manifests/ubuntuDesktop.pp
diff --git a/puppet/modules/baseconfig/files/bashrc b/puppet/modules/baseconfig/files/bashrc
deleted file mode 100644
index cacdb7d..0000000
--- a/puppet/modules/baseconfig/files/bashrc
+++ /dev/null
@@ -1,107 +0,0 @@
-# ~/.bashrc: executed by bash(1) for non-login shells.
-# see /usr/share/doc/bash/examples/startup-files (in the package bash-doc)
-# for examples
-
-# If not running interactively, don't do anything
-[ -z "$PS1" ] && return
-
-# don't put duplicate lines or lines starting with space in the history.
-# See bash(1) for more options
-HISTCONTROL=ignoreboth
-
-# append to the history file, don't overwrite it
-shopt -s histappend
-
-# for setting history length see HISTSIZE and HISTFILESIZE in bash(1)
-HISTSIZE=50000
-HISTFILESIZE=50000
-
-# check the window size after each command and, if necessary,
-# update the values of LINES and COLUMNS.
-shopt -s checkwinsize
-
-# If set, the pattern "**" used in a pathname expansion context will
-# match all files and zero or more directories and subdirectories.
-#shopt -s globstar
-
-# make less more friendly for non-text input files, see lesspipe(1)
-[ -x /usr/bin/lesspipe ] && eval "$(SHELL=/bin/sh lesspipe)"
-
-# set variable identifying the chroot you work in (used in the prompt below)
-if [ -z "$debian_chroot" ] && [ -r /etc/debian_chroot ]; then
-    debian_chroot=$(cat /etc/debian_chroot)
-fi
-
-# set a fancy prompt (non-color, unless we know we "want" color)
-case "$TERM" in
-    xterm-color) color_prompt=yes;;
-esac
-
-# uncomment for a colored prompt, if the terminal has the capability; turned
-# off by default to not distract the user: the focus in a terminal window
-# should be on the output of commands, not on the prompt
-force_color_prompt=yes
-
-if [ -n "$force_color_prompt" ]; then
-    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
-	# We have color support; assume it's compliant with Ecma-48
-	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
-	# a case would tend to support setf rather than setaf.)
-	color_prompt=yes
-    else
-	color_prompt=
-    fi
-fi
-
-if [ "$color_prompt" = yes ]; then
-    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;35m\]\u@\h\[\033[00m\]:\[\033[01;33m\]\w\[\033[00m\]\$ '
-else
-    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
-fi
-unset color_prompt force_color_prompt
-
-# If this is an xterm set the title to user@host:dir
-case "$TERM" in
-xterm*|rxvt*)
-    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
-    ;;
-*)
-    ;;
-esac
-
-# enable color support of ls and also add handy aliases
-if [ -x /usr/bin/dircolors ]; then
-    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
-    alias ls='ls --color=auto'
-    #alias dir='dir --color=auto'
-    #alias vdir='vdir --color=auto'
-
-    alias grep='grep --color=auto'
-    alias fgrep='fgrep --color=auto'
-    alias egrep='egrep --color=auto'
-fi
-
-# some more ls aliases
-alias ll='ls -alF'
-alias la='ls -A'
-alias l='ls -CF'
-
-# Add an "alert" alias for long running commands.  Use like so:
-#   sleep 10; alert
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-
-# Alias definitions.
-# You may want to put all your additions into a separate file like
-# ~/.bash_aliases, instead of adding them here directly.
-# See /usr/share/doc/bash-doc/examples in the bash-doc package.
-
-if [ -f ~/.bash_aliases ]; then
-    . ~/.bash_aliases
-fi
-
-# enable programmable completion features (you don't need to enable
-# this, if it's already enabled in /etc/bash.bashrc and /etc/profile
-# sources /etc/bash.bashrc).
-if [ -f /etc/bash_completion ] && ! shopt -oq posix; then
-    . /etc/bash_completion
-fi