Updated Classpath and Project Structure