Reorganized all files in diferents packages.
Solve bug search.