Re-arrange files for eclipse and test with genymotion