Reorganized packages for easier handling
Added code commenting