Reorganize packages
Reorganize log files. Add new folder for new logs