First commit with Hoodie architecture and some minor changes