Changed file organization slightly.