Start work on refactor all the system make more modular