Tweaks and update directory structure