Refactor and move things
If implemented