File Management

Cleaned up the source