Redid folder structure.
removed bin