Refine the project structre a little bit