Fixed bug

Also, renamed packages