Code revisions

Changed package naming and edited a LOT of code