Moved constants
Fixed file extension handling
Added status messages