Reorganized filestructure and added android/imp code.