Tidy up code
Add files from WordPress core that are needed