Changed class paths and dependencies based on Matei's comments