Cleaned up classpath, updated user story 6