Renamed some files and moved around some stuff to get things working.