Removed all Android Dependencies, fixed file location bug