New packages, Code refactoring
Delete old files