Got project ready for merging into android studio