Renamed files and functions (unix)
Serious refactoring of the UI code (unix)