Added Directory specifier
Removed upload functionality
Initial Checkin, seperate uploader