Merged all code to public repo