Refactorings. Added ability to include other files.