Clean up sample interface
Renamed files