First commit, define package structure