Merged Nirosha's changes. Moved files to new project.