Directory changes

Changed the folder layout to remove redunancy