Changed everything to comply with new OTP file system