fixed lib dependencies (moved libs to lib/, made classpath vars relative)
merged conflict