Major refactor, add projects