Directory Structure

Better directory structure