Remove broken cmake system since it's not maintained
Move stuff around to organize code