Fix #3: Some project restructuring to decrease fules number