minor changes
- restructured package
- minor fixes