Cleanup old code
Added virtual folders for files