Multitude of changes: moved many files to prepare for future changes; UI/frontend updates