Fixed load order issue by moving files to the lib folder