Added Plan class files
Removed classes files from makefile; replaced with plan for now
Moved classes around to fix compiler declaration errors