Reorganized, moved old code that might be needed as reference to a
different folder