Revised site setup for initial core layout