A lot of changes around core and theme folder