Started modifying network subystem to get into proper mvn layout plus a few other minor corrections.