Small fixes and in-tree/ folder added

Added folder where we can develop in-tree configuration...