Refactored and moved some packages.