Organized Class Directories
Cleaned dirs, added new deployment class