Restructured countries resources

See bd792429ed59bfe5b74d30a2a5724c68cd9c7dad for more