Improve report activity & restructure project