A lot of changes + package refactoring