Changed package naming convention and moved respective classes accordingly.