Improved file path generation.
Organized Using statements.