Refactored

Changed package of all files