Cleaned up folder structure after protoUI work