Moved android and lib source into their own subdirectories under src