Working on UI
 Doing some bugfixes
Major renaming of files and folders.