diff --git a/.github/ISSUE_TEMPLATE/session-proposal.md b/.github/ISSUE_TEMPLATE/session-proposal.md
new file mode 100644
index 0000000..a4ed7f0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/session-proposal.md
@@ -0,0 +1,31 @@
+---
+name: Code&Learn Session Proposal
+about: Submit a session proposal for the Code&Learn event
+title: 'Session Topic: '
+labels: Session Proposal
+assignees: christian-bromann, evahowe, jorydotcom, keywordnew
+
+---
+
+<!--
+Thank you! You are submitting a proposal for a session at the Code&Learn, Montreal 2019!
+
+Please include as much detail as you are able to at this moment. Don't worry, it doesn't have to be complete.
+
+Please feel free to link to any other issue, PR, or resource that could be relevant. This will help
+us to find the right faciliator from the project.
+-->
+
+**Topic of the session**
+
+
+**Project**
+<!--
+You can find a list of participating projects here: https://github.com/openjs-foundation/code-and-learn#participating-projects. Please label the issue with the appropiate project label.
+-->
+
+
+**Describe the session**
+
+
+**Additional context (optional)**
\ No newline at end of file
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..3f1a164
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,34 @@
+# Code of Conduct
+
+The OpenJS Foundation and its member projects use the Contributor
+Covenant v1.4.1 as its Code of Conduct. Refer to the following
+for the full text:
+
+* [english](https://www.contributor-covenant.org/version/1/4/code-of-conduct)
+* [translations](https://www.contributor-covenant.org/translations)
+
+Refer to the section on reporting and escalation in this document for the specific emails that can be used to report and escalate issues.
+
+# Reporting
+
+## Project Spaces
+
+For reporting issues in spaces related to a member project please use the email provided by the project for reporting. Projects handle CoC issues related to the spaces that they maintain.  Projects maintainers commit to:
+
+* maintain the confidentiality with regard to the reporter of an incident
+* to participate in the path for escalation as outlined in
+  the section on Escalation when required.
+
+## Foundation Spaces
+For reporting issues in spaces managed by the OpenJS Foundation, for example, repositories within the OpenJS organization, use the email `report@lists.openjsf.org`. The Cross Project Council (CPC) is responsible for managing these reports and commits to:
+
+* maintain the confidentiality with regard to the reporter of an incident
+* to participate in the path for escalation as outlined in
+  the section on Escalation when required.
+
+# Escalation
+
+The OpenJS Foundation maintains a Code of Conduct Panel (CoCP). This is a foundation-wide team established to manage escalation when a reporter believes that a report to a member project or the CPC has not been properly handled. In order to escalate to the CoCP send an email to `"coc-escalation@lists.openjsf.org`.
+
+For more information, refer to the full
+[Code of Conduct governance document](https://github.com/openjs-foundation/cross-project-council/tree/HEAD/proposals/approved/CODE_OF_CONDUCT).
\ No newline at end of file
diff --git a/README.md b/README.md
index 1c3c9b0..f340012 100644
--- a/README.md
+++ b/README.md
@@ -30,7 +30,7 @@ Check out the list of already [proposed Code&Learn sessions](https://github.com/
 
 #### Propose Your Session
 
-If you are interested in contributing to a specific area that is not already covered in the proposed sessions you can [create a new issue](https://github.com/openjs-foundation/code-and-learn/issues/new) and we will try to find the appropiate faciliator of the project for it. Please understand that a proposed session needs to have at least 5-10 attendees that are also interested to contribute in the session.
+If you are interested in contributing to a specific area that is not already covered in the proposed sessions you can [create a new issue](https://github.com/openjs-foundation/code-and-learn/issues/new?assignees=christian-bromann%2C+evahowe%2C+jorydotcom%2C+keywordnew&labels=Session+Proposal&template=session-proposal.md&title=Session+Topic%3A+) and we will try to find the appropiate faciliator of the project for it. Please understand that a proposed session needs to have at least 5-10 attendees that are also interested to contribute in the session.
 
 ## Participating Projects
 
@@ -63,6 +63,6 @@ If you are interested in contributing to a specific area that is not already cov
 [![QUnit](https://openjsf.org/wp-content/uploads/sites/84/2019/05/qunit_medium.png "QUnit")](https://qunitjs.com/)
 [![JerryScript](https://openjsf.org/wp-content/uploads/sites/84/2019/05/jerryscript_medium.png "JerryScript")](https://jerryscript.net/)
 
-## [Code Of Conduct](https://github.com/openjs-foundation/cross-project-council/blob/master/CODE_OF_CONDUCT.md#code-of-conduct)
+## [Code Of Conduct](https://github.com/openjs-foundation/code-and-learn/blob/HEAD/CODE_OF_CONDUCT.md#code-of-conduct)
 
 In the interest of fostering an open and welcoming environment, we as organizers, contributors and maintainers pledge to make participation for the event, in our projects and community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
\ No newline at end of file