Refine Project Structure - WIP