restructured directories and done minor mods