Updated to a better directory structure