tweaks and some directory structure added