Reorganized source, added binaries