restructured package directory a little for clarity and ease of maneuvering