Refactory on packages
Improving views