fixed package structure, and some minor bugs

- [x] En liten kommentar.. Måste prova. ;)
- [ ] :octopus: 
- [x] :+1: