changed structure to make obtaining lib files easier