Revert moving files from template folder
Adds support for target option
Port build to Q
Port build and run to Q