web folder refactored