[NEW] Moved classes into Classes directory, updated workspace to include project