Structure CleanUp

Directory Structure clean up