Turned off -Werror (convenience for development purposes). Some code layout reorganization.