fixing file load order issues, reorganizing some shiz