Re-Organize Directory Structure

Change the directory structure to better organize classes.