change package structure to have an easier setup