added some validations, rearranged directory structure.
slight routing tweaks