Changed directory structure to better accomodate Cargo