Changed file names; better directory structure