Cleaned up folder files and updated plans