Refactor Site Structure