Change to Apache Software Foundation's standard directory structure