closes feature #5
Package restructure