Re-arranged the package structure

Re-arranged the package structure so that it would be more organized
and make a bit more sense.