Major refactor of moving functionality from project to editor