Renamed some files

This was to keep the data, ui component separation more clear.