reorganize folders and overall project cleanup