Complete restructuring to work straight off wordpress