Re Organized Files

Changed file organization