Package restructuring

- Packages re-organized
- Bug in savePlace fixed