Reorganize Business Layer