Removed bins, merged old changes into source files.