Split up into multiple files
Remove bounds from dependencies