Simplify files and API