Cleaned some code
Created data subpackage