Tidied up the package structure