Development 2

Mass refactor and stuff + import cleanup