Rearrange Code to a better directory structure