Split into multiple files and created library