changed application structure, renamed packages