Moved to proper package directory structure