Made code Complient to Maven Standards

Also fixed package errors.