switch misc usage to tools and use explicit imports
make sure there is a blank line at the end of files, if this is missing it can cause weird bugs