updated file structure to work in Eclipse ADT