cleaning up a lot
changed the way bin folder is handled
resolved a conflict