Change AndroidLibrary to normal Java library for faster testing
Adding network module to app deps
Extra module some refactoring