Sorted out require statements

Split Address Module into separate file.