diff --git a/.fixtures.yml b/.fixtures.yml
index c65ab3cd..f747b969 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -1,11 +1,15 @@
 fixtures:
   repositories:
     "inifile": "git://github.com/puppetlabs/puppetlabs-inifile"
-    "keystone": "git://github.com/stackforge/puppet-keystone.git"
+    'keystone':
+      repo: 'git://github.com/stackforge/puppet-keystone.git'
+      ref: 'stable/havana'
     "mysql":
       repo: 'git://github.com/puppetlabs/puppetlabs-mysql.git'
       ref: 'origin/0.x'
-    "nova": "git://github.com/stackforge/puppet-nova.git"
+    'nova':
+      repo: 'git://github.com/stackforge/puppet-nova.git'
+      ref: 'stable/havana'
     "stdlib": "git://github.com/puppetlabs/puppetlabs-stdlib.git"
   symlinks:
     "heat": "#{source_dir}"
diff --git a/.gitreview b/.gitreview
index 37bb1b28..270b7241 100644
--- a/.gitreview
+++ b/.gitreview
@@ -2,3 +2,4 @@
 host=review.openstack.org
 port=29418
 project=stackforge/puppet-heat.git
+defaultbranch=stable/havana
diff --git a/Modulefile b/Modulefile
index a7d894d0..4e2c3ac0 100644
--- a/Modulefile
+++ b/Modulefile
@@ -1,13 +1,13 @@
-name    'enovance-heat'
-version '0.0.1'
-source 'none'
+name    'puppetlabs-heat'
+version '3.0.0-rc2'
+source 'https://github.com/stackforge/puppet-heat'
 author 'enovance'
 license 'Apache License, Version 2.0'
 summary 'Install/configure Openstack Heat'
 description 'Install/configure Openstack Heat'
-project_page 'https://launchpad.net/Heat'
+project_page 'https://launchpad.net/puppet-heat'
 
 # Dependencies
 dependency 'puppetlabs/stdlib', '>= 3.2.0'
-dependency 'cprice404/inifile', '>= 0.9.0'
+dependency 'puppetlabs/inifile', '>= 1.0.0 <2.0.0'
 dependency 'puppetlabs/mysql', '>= 0.5.0'
diff --git a/README b/README
deleted file mode 100644
index 1c802271..00000000
--- a/README
+++ /dev/null
@@ -1,40 +0,0 @@
-puppet-heat
-This is the Heat module.
-
-WORK IN PROGRESS :
-
-✓ Basic structure
-✗ DB
-✓ Keystone (Users, Services, Endpoints)
-✓ Client
-✓ Heat-API
-✓ Heat-API-CFN
-✓ Heat-API-CW
-✓ Heat-Engine
-✓ An example of site.pp
-✗ Write Tests (in progress)
-
-
-License
--------
-
-Apache License 2.0
-
-   Copyright 2012 eNovance <licensing@enovance.com>
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-Contact
--------
-
-techs@enovance.com
diff --git a/README.md b/README.md
new file mode 100644
index 00000000..295c2e6d
--- /dev/null
+++ b/README.md
@@ -0,0 +1,73 @@
+puppet-heat
+===========
+
+#### Table of Contents
+
+1. [Overview - What is the heat module?](#overview)
+2. [Module Description - What does the module do?](#module-description)
+3. [Setup - The basics of getting started with heat](#setup)
+4. [Implementation - An under-the-hood peek at what the module is doing](#implementation)
+5. [Limitations - OS compatibility, etc.](#limitations)
+6. [Development - Guide for contributing to the module](#development)
+7. [Contributors - Those with commits](#contributors)
+8. [Release Notes - Notes on the most recent updates to the module](#release-notes)
+
+Overview
+--------
+
+The heat module is part of [Stackforge](https://github.com/stackforge), an effort by the
+OpenStack infrastructure team to provice continuous integration testing and code review for
+OpenStack and OpenStack community projects not part of the core software. The module itself
+is used to flexibly configure and manage the orchestration service for OpenStack
+
+Module Description
+------------------
+
+The heat module is an attempt to make Puppet capable of managing the entirety of heat.
+
+Setup
+-----
+
+**What the heat module affects**
+
+* heat, the orchestration service for OpenStack
+
+### Installing heat 
+
+  example% puppet module install puppetlabs/heat
+
+### Beginning with heat
+
+Implementation
+--------------
+
+### heat
+
+heat is a combination of Puppet manifests and Ruby code to deliver configuration and
+extra functionality through types and providers.
+
+Limitations
+-----------
+
+* The heat modules have only been tested on RedHat and Ubuntu family systems.
+
+Development
+-----------
+
+Developer documentation for the entire puppet-openstack project
+
+* https://wiki.openstack.org/wiki/Puppet-openstack#Developer_documentation
+
+Contributors
+------------
+
+* https://github.com/stackforge/puppet-heat/graphs/contributors
+
+This is the heat module.
+
+Release Notes
+-------------
+
+** 3.0.0 **
+
+* Initial release of the puppet-heat module.