Initial commit - fixed class path issues