Better organization of API code and specs