Updated to proper directory structure