Rework many things

Less binaries
Less options